Code looks good at first glance. I haven't tracked the builder and cli changes lately, but how is this a regression exactly? From the commit messages, you're changing the cache to use pointers for performance, and change == to equals to prevent pointer comparison?

The regression was in the struct comparison with == operator, before it was working because the struct had only strings inside.

The comparison with == works only if there are no pointers involved:

• you must compare directly the structs (as values) and not pointers to the structs (otherwise the pointers will be different even if the "content" of the struct is the same)
• the struct fields must all be values (non-pointers) for the same reason as above

PS I'm going to do another round of refactoring to simplify this part and to move it out of the legacy package, I'd like your review once done :-)